Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 4 Sep 2011 19:06:14 +0000 (12:06 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 4 Sep 2011 19:06:14 +0000 (12:06 -0700)

Trivial merge